Index: main/plugin-web/plugin.xml
===================================================================
--- main/plugin-web/plugin.xml	(revision 18980)
+++ main/plugin-web/plugin.xml	(working copy)
@@ -1105,6 +1105,10 @@
 			           class="org.ametys.web.workflow.ValidateContentFunction">
 			    <!-- Workflow function for validating a content -->
 			</component>
+			<component role="org.ametys.web.workflow.AddLiveLabelFunction"
+			           class="org.ametys.web.workflow.AddLiveLabelFunction">
+			    <!-- Workflow function for adding live label on a content -->
+			</component>
 			<component role="org.ametys.web.workflow.DeleteContentFunction"
 			           class="org.ametys.web.workflow.DeleteContentFunction">
 			    <!-- Workflow function for deleting a content -->
Index: main/plugin-web/src/org/ametys/web/workflow/ValidateContentFunction.java
===================================================================
--- main/plugin-web/src/org/ametys/web/workflow/ValidateContentFunction.java	(revision 18980)
+++ main/plugin-web/src/org/ametys/web/workflow/ValidateContentFunction.java	(working copy)
@@ -107,9 +107,5 @@
         content.setProposalDate(null);
         
         content.saveChanges();
-        
-        // FIXME API check if not versionnable
-        ((VersionableAmetysObject) content).checkpoint();
-        ((VersionableAmetysObject) content).addLabel(WebConstants.LIVE_LABEL, true);
     }
 }
Index: main/plugin-web/src/org/ametys/web/workflow/AddLiveLabelFunction.java
===================================================================
--- main/plugin-web/src/org/ametys/web/workflow/AddLiveLabelFunction.java	(revision 0)
+++ main/plugin-web/src/org/ametys/web/workflow/AddLiveLabelFunction.java	(revision 0)
@@ -0,0 +1,44 @@
+/*
+ *  Copyright 2011 Anyware Services
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.ametys.web.workflow;
+
+import java.util.Map;
+
+import org.ametys.cms.repository.WorkflowAwareContent;
+import org.ametys.cms.workflow.AbstractContentWorkflowComponent;
+import org.ametys.plugins.repository.version.VersionableAmetysObject;
+import org.ametys.web.WebConstants;
+
+import com.opensymphony.module.propertyset.PropertySet;
+import com.opensymphony.workflow.FunctionProvider;
+import com.opensymphony.workflow.WorkflowException;
+
+/**
+ * Add live label on current version
+ */
+public class AddLiveLabelFunction extends AbstractContentWorkflowComponent implements FunctionProvider
+{
+    @Override
+    public void execute(Map transientVars, Map args, PropertySet ps) throws WorkflowException
+    {
+        WorkflowAwareContent content = getContent(transientVars);
+        
+        if (content instanceof VersionableAmetysObject)
+        {
+            ((VersionableAmetysObject) content).addLabel(WebConstants.LIVE_LABEL, true);
+        }
+    }
+}